Merge.
authorIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Thu, 22 Dec 2005 16:15:33 +0000 (16:15 +0000)
committerIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Thu, 22 Dec 2005 16:15:33 +0000 (16:15 +0000)

Trivial merge